Make the initialization of screen_x11->xft_rgba more explicit. (#319627,

2005-10-25  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkxftdefaults.c (init_xft_settings): Make the
	initialization of screen_x11->xft_rgba more explicit.  (#319627,
	Bogdan Nicula)

diff --git a/ChangeLog b/ChangeLog
index cf787408463dd5bffdfef4b55481a005f2c3499d..4d8da030ec50b6765495b558b3b1b01827c413e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-10-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkxftdefaults.c (init_xft_settings): Make the 
+       initialization of screen_x11->xft_rgba more explicit.  (#319627,
+       Bogdan Nicula)
+
        * gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Fix whitespace
        in a blurb.  (#319499, Francisco Javier F. Serrador)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cf787408463dd5bffdfef4b55481a005f2c3499d..4d8da030ec50b6765495b558b3b1b01827c413e5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-10-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkxftdefaults.c (init_xft_settings): Make the 
+       initialization of screen_x11->xft_rgba more explicit.  (#319627,
+       Bogdan Nicula)
+
        * gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Fix whitespace
        in a blurb.  (#319499, Francisco Javier F. Serrador)
 

diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index dd792642c2d90ef492b3c2abc36328cc83510530..79dd26cd32b5b9c4826f5b368776a65198930a61 100644 (file)
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -200,9 +200,9 @@ init_xft_settings (GdkScreen *screen)
              break;
            }
        }
+#endif
 
       screen_x11->xft_rgba = subpixel;
-#endif
     }
 
   if (!get_double_default (xdisplay, "dpi", &dpi_double))